bitkeeper revision 1.1159.228.1 (41f5b266Q7RVJ_3Cm0VymUcoULLZ2g)

Makefile fix prefix -> DESTDIR
Signed-off-by: ian.pratt@cl.cam.ac.uk

diff --git a/tools/ioemu/iodev/Makefile b/tools/ioemu/iodev/Makefile
index 1d29463d260682fb80848eb3e12d48584de6b859..3a436619183021552d1c228bc3a23ee228779321 100644 (file)
--- a/tools/ioemu/iodev/Makefile
+++ b/tools/ioemu/iodev/Makefile
@@ -12,4 +12,4 @@ device-model: $(OBJS) $(BXLIBS)
 include $(TOPDIR)/mk/helix.mk
 
 install:: all
-       install device-model $(prefix)/usr/sbin
+       install device-model $(DESTDIR)/usr/sbin

diff --git a/tools/xcs/Makefile b/tools/xcs/Makefile
index 7fc8286991f156a42969f2f33c200dc33bd64080..51d132b83a0bfd3c29d7fc9fa856134810c2fbfa 100644 (file)
--- a/tools/xcs/Makefile
+++ b/tools/xcs/Makefile
@@ -6,6 +6,10 @@ include $(XEN_ROOT)/tools/Make.defs
 
 XCS_INSTALL_DIR = /usr/sbin
 
+INSTALL         = install
+INSTALL_PROG    = $(INSTALL) -m0755
+INSTALL_DIR     = $(INSTALL) -d -m0755
+
 CC       = gcc
 CFLAGS   = -Wall -Werror -g3 -D _XOPEN_SOURCE=600
 
@@ -37,8 +41,8 @@ $(BIN): $(OBJS)
        $(CC) $(CFLAGS) $^ -o $@ -L$(XEN_LIBXC) -L$(XEN_LIBXUTIL) -lxc -lxutil 
 
 install: xcs xcsdump
-       mkdir -p $(prefix)/$(XCS_INSTALL_DIR)
-       mkdir -p $(prefix)/usr/include
-       install -m0755 xcs $(prefix)/$(XCS_INSTALL_DIR)
-       install -m0755 xcsdump $(prefix)/$(XCS_INSTALL_DIR)
-       install -m0644 xcs_proto.h $(prefix)/usr/include
+       $(INSTALL_DIR) -p $(DESTDIR)/$(XCS_INSTALL_DIR)
+       $(INSTALL_DIR) -p $(DESTDIR)/usr/include
+       $(INSTALL_PROG) xcs $(DESTDIR)/$(XCS_INSTALL_DIR)
+       $(INSTALL_PROG) xcsdump $(DESTDIR)/$(XCS_INSTALL_DIR)
+       $(INSTALL_PROG) xcs_proto.h $(DESTDIR)/usr/include